Fix Contact list modal broken in landscape mode by GCyganek · Pull Request #96751 · Expensify/App

GCyganek · 2026-07-22T14:27:44Z

Explanation of Change

Fixes Contact list modal which is broken in landscape mode, also adjusts height when the keyboard is open. Adds a shared calculateModalHeightInLandscapeMode util (accounts for top safe-area inset and active keyboard height) and uses it in the Submit To popover and Emoji Picker (where there was a similar logic for modal height). Also hides the confirm button while the keyboard is active in landscape so that the input and list is visible while typing with open keyboard, and simplifies the landscape checks to no longer require isSmallScreenWidth.

Fixed Issues

$ #95096
PROPOSAL: N/A

Tests

Prerequisites: use Submit workspace

Switch deviceto landscape orientation.
Open a report that can be submitted and tap the submit button to open the Contact list modal.
Tap the search input to bring up the keyboard.
Verify the popover content shrinks to fit above the keyboard (does not get clipped or overflow the screen) .
Dismiss the keyboard and verify the confirm button reappears and the popover returns to its normal height.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-07-22.at.16.23.08.mov

Android: mWeb Chrome

Screen.Recording.2026-07-22.at.16.35.41.mov

iOS: Native

Screen.Recording.2026-07-22.at.16.24.41.mov

iOS: mWeb Safari

Screen.Recording.2026-07-22.at.16.37.51.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-22.at.16.29.10.mov

GCyganek · 2026-07-22T14:27:52Z

@codex review

chatgpt-codex-connector · 2026-07-22T14:35:42Z

Codex Review: Didn't find any major issues. 👍

Reviewed commit: d72affc684

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

melvin-bot · 2026-07-22T14:38:24Z

@truph01 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d72affc684

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

joekaufmanexpensify

Good for product.

truph01 · 2026-07-24T09:14:23Z

Prerequisites: use Submit workspace

@GCyganek Do you know how to create Submit workspace? It looks like it is a beta feature in OD, right?

GCyganek · 2026-07-24T13:03:25Z

@GCyganek Do you know how to create Submit workspace? It looks like it is a beta feature in OD, right?

@truph01 I had problem with creating it so I just hardcoded isSubmitPolicy to always return true for testing

truph01 · 2026-07-25T14:39:03Z

@GCyganek Do you know how to create Submit workspace? It looks like it is a beta feature in OD, right?

@truph01 I had problem with creating it so I just hardcoded isSubmitPolicy to always return true for testing

@GCyganek Thanks for your suggestion. I am going to use it to test the change in this PR.

truph01 · 2026-07-26T12:22:51Z

@GCyganek I'm unable to scroll the list without dismissing the keyboard. As soon as I start scrolling, the keyboard is automatically closed.

Screen.Recording.2026-07-26.at.19.21.06.mov

truph01 · 2026-07-26T12:31:44Z

This PR broke the UI in staging (an additional space was added):

Staging	PR

…pover

codecov · 2026-07-27T07:13:23Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/components/withKeyboardState.tsx	`100.00% <ø> (ø)`
.../EmojiPicker/EmojiPickerMenu/useEmojiPickerMenu.ts	`3.44% <0.00%> (-0.13%)`	⬇️
src/hooks/useReportSubmitToPopover.tsx	`70.23% <57.14%> (-0.50%)`	⬇️
src/pages/ReportSubmitToContent.tsx	`0.00% <0.00%> (ø)`
src/utils/calculateModalHeightInLandscapeMode.ts	`0.00% <0.00%> (ø)`
... and 95 files with indirect coverage changes

GCyganek · 2026-07-27T09:04:27Z

I'm unable to scroll the list without dismissing the keyboard. As soon as I start scrolling, the keyboard is automatically closed.

is there a case when this is possible? I thought this is the default behaviour, see this is how it works on main when I test different popovers with input + selection list on both ios and Android:

Screen.Recording.2026-07-27.at.09.39.08.mov

Screen.Recording.2026-07-27.at.11.03.19.mov

truph01 · 2026-07-27T09:42:33Z

is there a case when this is possible? I thought this is the default behaviour, see this is how it works on main when I test different popovers with input + selection list on both ios and Android:

@GCyganek If it is general behavior, we can skip it.

truph01 · 2026-07-27T09:42:58Z

Now there is only one comment needs to be address #96751 (comment)

GCyganek · 2026-07-27T10:04:56Z

This PR broke the UI in staging (an additional space was added):

Should be fixed now:

truph01 · 2026-07-29T03:05:31Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained """"why"""" the code was doing something instead of only explaining """"what"""" the code was doing.
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-07-29.at.09.45.33.mov

Screen.Recording.2026-07-29.at.09.46.07.mov

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.2026-07-29.at.09.41.08.mov

Screen.Recording.2026-07-29.at.09.42.30.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

truph01 · 2026-07-29T03:40:54Z

+        return availableWindowHeight - keyboardActiveHeight;
+    }
+
+    return windowHeight * CONST.MODAL_MAX_HEIGHT_TO_WINDOW_HEIGHT_RATIO_LANDSCAPE_MODE;


Should we use availableWindowHeight instead of windowHeight?

truph01 · 2026-07-29T03:49:20Z

    const listStyle = StyleUtils.getEmojiPickerListHeight(
        isListFiltered,
-        windowHeight * (isInLandscapeMode ? CONST.MODAL_MAX_HEIGHT_TO_WINDOW_HEIGHT_RATIO_LANDSCAPE_MODE : 0.95) - keyboardHeight,
+        isInLandscapeMode ? calculateModalHeightInLandscapeMode(windowHeight, topSafeAreaInset, keyboardActiveHeight) : (windowHeight - topSafeAreaInset) * 0.95 - keyboardActiveHeight,


Portrait-mode height formula changed as a side-effect

The old code was windowHeight * 0.95 - keyboardHeight. The new code subtracts topSafeAreaInset before scaling and switches from keyboardHeight to keyboardActiveHeight — both are behavioral changes in portrait mode. Was the portrait-mode change intentional here, or should the non-landscape branch stay closer to the original?

Fix Contact list modal broken in landscape mode

d72affc

melvin-bot Bot assigned GCyganek Jul 22, 2026

GCyganek marked this pull request as ready for review July 22, 2026 14:38

GCyganek requested review from a team as code owners July 22, 2026 14:38

melvin-bot Bot requested review from joekaufmanexpensify and truph01 July 22, 2026 14:38

melvin-bot Bot removed request for a team July 22, 2026 14:38

chatgpt-codex-connector Bot reviewed Jul 22, 2026

View reviewed changes

Comment thread src/utils/calculateModalHeightInLandscapeMode.ts

joekaufmanexpensify previously approved these changes Jul 22, 2026

View reviewed changes

Merge branch 'main' into @GCyganek/landscape-mode/report-submit-to-po…

dbecb70

…pover

Fix popover height

0ba9d33

GCyganek dismissed joekaufmanexpensify’s stale review via 0ba9d33 July 27, 2026 10:03

truph01 reviewed Jul 29, 2026

View reviewed changes

Uh oh!

Conversation

GCyganek commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

GCyganek commented Jul 22, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 22, 2026

Uh oh!

melvin-bot Bot commented Jul 22, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

truph01 commented Jul 24, 2026

Uh oh!

GCyganek commented Jul 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

truph01 commented Jul 25, 2026

Uh oh!

truph01 commented Jul 26, 2026

Uh oh!

truph01 commented Jul 26, 2026

Uh oh!

codecov Bot commented Jul 27, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

GCyganek commented Jul 27, 2026

Uh oh!

truph01 commented Jul 27, 2026

Uh oh!

truph01 commented Jul 27, 2026

Uh oh!

GCyganek commented Jul 27, 2026

Uh oh!

truph01 commented Jul 29, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

truph01 Jul 29, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Jul 29, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

GCyganek commented Jul 22, 2026 •

edited

Loading

GCyganek commented Jul 24, 2026 •

edited

Loading

codecov Bot commented Jul 27, 2026 •

edited by github-actions Bot

Loading